Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up widget #51

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Clean up widget #51

merged 2 commits into from
Aug 9, 2024

Conversation

IgorTatarnikov
Copy link
Member

Before submitting a pull request (PR), please read the contributing guide.

Please fill out as much of this template as you can, but if you have any problems or questions, just leave a comment and we will help out :)

Description

What is this PR

  • Bug fix
  • Addition of a new feature
  • Other

Why is this PR needed?
There was an empty widget that showed up in the RegistrationWidget container

What does this PR do?
Removes the empty widget.

References

Please reference any existing issues/PRs that relate to this PR.

How has this PR been tested?

Tested by visual inspection.

Is this a breaking change?

No

Does this PR require an update to the documentation?

No

Checklist:

  • The code has been tested locally
  • Tests have been added to cover all new functionality (unit & integration)
  • The documentation has been updated to reflect any changes
  • The code has been formatted with pre-commit

@IgorTatarnikov IgorTatarnikov requested a review from a team August 8, 2024 16:16
Copy link

codecov bot commented Aug 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.28%. Comparing base (538cdd2) to head (1233457).
Report is 2 commits behind head on dev.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev      #51      +/-   ##
==========================================
- Coverage   82.91%   82.28%   -0.64%     
==========================================
  Files           8        8              
  Lines         515      649     +134     
==========================================
+ Hits          427      534     +107     
- Misses         88      115      +27     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@alessandrofelder alessandrofelder merged commit 88377a2 into dev Aug 9, 2024
23 of 25 checks passed
@alessandrofelder alessandrofelder deleted the clean-rogue-widget branch August 9, 2024 08:56
@IgorTatarnikov IgorTatarnikov mentioned this pull request Aug 16, 2024
7 tasks
alessandrofelder added a commit that referenced this pull request Aug 16, 2024
* Moving from tabs to a dropdown style widget (#25)

* Fixed contents margins

* Added brainglobe-utils as dependency

* Added min dependency version for brainglobe-utils

* Add option to scale sample image (#26)

* Fixed contents margins

* Scaling of sample image added to adjust moving image dropdown

* Added brainglobe-utils as dependency

* Added error message when no images selected

* Added tests for scaling

* Added tests to check multiple scale_factors

* Cache the moving image data to allow scaling image multiple times

* Fixed tests by removing (0,0) case add guard in _on_scale_image in registration_widget.py

* Fixed tests

* Add docstring to _on_scale_moving_image

* Replaced all curr_ variable names with current_

* Added units to pixel size selection, set max range to be 100

* Allow free rotation of the atlas (#36)

* Fixed contents margins

* Scaling of sample image added to adjust moving image dropdown

* Added brainglobe-utils as dependency

* Added error message when no images selected

* Atlas rotation working using scipy

* Pitch, yaw, roll implemented using one affine transform

* Dask loading for both the reference atlas and the rotation

* Added a 'Reset Atlas' button, blocked while dask computes the rotation to avoid race conditions

* Rotate atlas button also greyed out while daks processes the rotation

* Use the update upload_pypi action (#29)

See neuroinformatics-unit/movement#108

* Added elastix Logs directory to .gitignore

* Fixed tests

* Moved run_registration to be imported just as run button is clicked to avoid long boot times

* Atlas rotation works again (might relate to napari 0.4.19

* Added test for atlas_rotation_signal from AdjustMovingImage view

* [pre-commit.ci] pre-commit autoupdate (#30)

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.2.0](astral-sh/ruff-pre-commit@v0.1.9...v0.2.0)
- [github.com/psf/black: 23.12.1 → 24.1.1](psf/black@23.12.1...24.1.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate (#31)

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.2.0 → v0.3.5](astral-sh/ruff-pre-commit@v0.2.0...v0.3.5)
- [github.com/psf/black: 24.1.1 → 24.3.0](psf/black@24.1.1...24.3.0)
- [github.com/pre-commit/mirrors-mypy: v1.8.0 → v1.9.0](pre-commit/mirrors-mypy@v1.8.0...v1.9.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Import header from brainglobe-utils (#33)

* import header from brainglobe-utils

* split package name over two lines

* remove brainglobe png from manifest

* add brainglobe-utils dependency

* Update requirements (#34)

* import header from brainglobe-utils

* split package name over two lines

* remove brainglobe png from manifest

* add brainglobe-utils dependency

* Switched from bg-atlasapi to brainglobe-atlasapi

* Added lxml_html_clean explicitly to requirements

* Pinned itk to 5.4rc2 for now as 5.4rc3 cased a seg fault

* Undo itk pin

---------

Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com>

* add codecov token (#35)

* Added tests for calculate_rotated_bounding_box

* Fixed docstrings for functions in utils.py

* Keep track of napari layers for the atlas and atlas annotations in the napari widget class

* Added tests for atlas rotation

* Fixed pre-commit

* Add test for reset_atlas in adjust_moving_image_view

* Add caching

* Update the function calls in test_adjust_moving_image_view

* Apply suggestions from code review

Co-authored-by: Alessandro Felder <alessandrofelder@users.noreply.github.com>

* Applied suggestions from code review

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Applied suggestions from code review

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com>
Co-authored-by: Alessandro Felder <alessandrofelder@users.noreply.github.com>

* Cleaned up a few things

* Mark 'Advanced Settings' as optional (#48)

* Info message when running BrainGlobe Registration plugin with no atlas installed (#46)

* added error when no atlas found

* added error when no atlas found

* Update brainglobe_registration/registration_widget.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/registration_widget.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* changes to info message

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/registration_widget.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* parent_widget

* parent_widget

---------

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Clean up widget (#51)

* Cleaned up rogue widget duplication

* Added parent to parameters_tab

* Fix slow plugin loading (#54)

* Filter Images (#52)

* work_in_progress

* filter_images

* filter_images

* filter_images

* filter_images

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/utils/utils.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Communicate napari layer deletions appropriately to the plugin (#49)

* layer_deletion

* Update brainglobe_registration/registration_widget.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* layer_deletion_edits

* Made pytest happy

* Update brainglobe_registration/registration_widget.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/registration_widget.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* Update brainglobe_registration/registration_widget.py

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* updated_layer

* fixed manual vs automatic deletion

* fixed manual vs automatic deletion

* Refactored some old code to avoid duplication

* add comments

---------

Co-authored-by: Igor Tatarnikov <61896994+IgorTatarnikov@users.noreply.github.com>
Co-authored-by: IgorTatarnikov <igor.tatarnikov@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Kimberly Meechan <24316371+K-Meech@users.noreply.github.com>
Co-authored-by: Alessandro Felder <alessandrofelder@users.noreply.github.com>
Co-authored-by: saarah815 <63860766+saarah815@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants